Update to using Clutter 1.0

Change the pkg-config and .gir requirements.

diff --git a/configure.ac b/configure.ac
index 647e73a1b5e28322d759ff20b41594b3b034ea69..e31698c4a454d6ab129cca63cdb789c4c7460b2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,16 +34,16 @@ if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
    recorder_modules="gstreamer-0.10 gstreamer-base-0.10 xfixes"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-0.9)
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0)
 else
    AC_MSG_RESULT(no)
 fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-0.9 clutter-glx-0.9)
-PKG_CHECK_MODULES(TIDY, clutter-0.9)
-PKG_CHECK_MODULES(BIG, clutter-0.9 gtk+-2.0 librsvg-2.0)
+PKG_CHECK_MODULES(MUTTER_PLUGIN, gio-unix-2.0 gtk+-2.0 dbus-glib-1 mutter-plugins gjs-gi-1.0 xscrnsaver libgnome-menu $recorder_modules gconf-2.0 gdk-x11-2.0 clutter-x11-1.0 clutter-glx-1.0)
+PKG_CHECK_MODULES(TIDY, clutter-1.0)
+PKG_CHECK_MODULES(BIG, clutter-1.0 gtk+-2.0 librsvg-2.0)
 PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-2.0)
 PKG_CHECK_MODULES(TRAY, gtk+-2.0)
 PKG_CHECK_MODULES(TASKPANEL, libwnck-1.0 dbus-glib-1)

diff --git a/src/Makefile.am b/src/Makefile.am
index d39f6cfde96fd8f7590d27322c0d78d5baa4f1c9..8a7eae6e676fd85e37cae9f227f6617b27ead249 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -153,7 +153,7 @@ Shell-0.1.gir: $(mutter) $(G_IR_SCANNER) Big-1.0.gir libgnome-shell.la Makefile
                --namespace=Shell                       \
                --nsversion=0.1                         \
                --add-include-path=$(MUTTER_LIB_DIR)/mutter/ \
-               --include=Clutter-0.9                   \
+               --include=Clutter-1.0                   \
                --include=Meta-2.27                     \
                --add-include-path=$(builddir)     \
                --include=Big-1.0     \
@@ -174,7 +174,7 @@ Tidy-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libtidy-1.0.la Makefil
        $(G_IR_SCANNER)                                 \
                --namespace=Tidy                        \
                --nsversion=1.0                         \
-               --include=Clutter-0.9                   \
+               --include=Clutter-1.0                   \
                --program=mutter                        \
                --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \
                $(addprefix $(srcdir)/,$(tidy_source_h)) \
@@ -192,7 +192,7 @@ Big-1.0.gir: $(mutter) $(G_IR_SCANNER) libgnome-shell.la libbig-1.0.la Makefile
        $(G_IR_SCANNER)                                 \
                --namespace=Big                 \
                --nsversion=1.0                         \
-               --include=Clutter-0.9                   \
+               --include=Clutter-1.0                   \
                --include=GdkPixbuf-2.0                 \
                --program=mutter                        \
                --program-arg=--mutter-plugins=$$(pwd)/libgnome-shell.la \